Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Redesign] Training Screen + Accessibility (fixes - home/language screen) #54

Merged
merged 11 commits into from
Aug 25, 2023

Conversation

nayushi
Copy link
Contributor

@nayushi nayushi commented Aug 17, 2023

  • Redesign Training Screen
  • Training Screen Accessibility
  • Fixes Accessibility bugs at Home and Add new language screen
  • Removed emoji
  • Added empty scenario at home and training screen

nayushi and others added 9 commits February 4, 2023 22:18
# Conflicts:
#	VocabularyTrainer.xcodeproj/project.pbxproj
#	VocabularyTrainer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	VocabularyTrainer/Home Screen/ViewController/HomeViewController.swift
#	VocabularyTrainer/Localizable/de.lproj/Localizable.strings
#	VocabularyTrainer/Localizable/en.lproj/Localizable.strings
#	VocabularyTrainer/Localizable/hi.lproj/Localizable.strings
#	VocabularyTrainer/Localizable/nl.lproj/Localizable.strings
#	VocabularyTrainer/Localizable/pt-BR.lproj/Localizable.strings
@misteu
Copy link
Owner

misteu commented Aug 17, 2023

I created another branch from this PR's branch where I fixed merge conflicts: https://github.com/misteu/VocabularyTraining/tree/feature/fix-merge-conflict-for-pr

The already released fixes for the import/export feature were not on master yet due to ssh issues on my machine last time. Pushed the changes just now.

If everything seems fine, just merge this branch into your branch (should be possible without further conflucts I hope 🤞)

@misteu
Copy link
Owner

misteu commented Aug 20, 2023

One last thing:

The "take a look" does work now differently. Before you could take a look (i.e. unhide the word) and tap whether you guessed correctly or not. Now it seems to be unhidden as long as you hold it but you still have to type the other side.

I think we should keep it like before as I only added this because of user feedback back then. It's main purpose was to quickly being able to go through learning without having to type.

@misteu misteu merged commit 3ec2e1b into misteu:master Aug 25, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants